Switch emacs24 from GTK+ 2 to GTK+ 3.

Closes: #679931

diff --git a/debian/control b/debian/control
index d1fcf16de1a429e32373eda9f5239d38ef7e0534..7f42ec0bea38076f55021aa1fc61bf23021821a0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
  libgpm-dev [linux-any], libdbus-1-dev,
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
- debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
+ debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
  libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Homepage: http://www.gnu.org/software/emacs/

diff --git a/debian/control.in b/debian/control.in
index 276d517734408ba573ff577232f1c9133e1add69..838ceabf1b335042ed24f8e461a5d4dfddca48e4 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
  libgpm-dev [linux-any], libdbus-1-dev,
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
- debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
+ debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
  libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Homepage: http://www.gnu.org/software/emacs/

diff --git a/debian/rules b/debian/rules
index 0479161d2912719be0f4d48627658088b1c839cc..644055fe51456868bf1d7c9bd55bfc4fcf2cd62f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -318,7 +318,7 @@ confflags += --with-crt-dir=/usr/lib/$(deb_host_multiarch)
 # x configure flags
 confflags_x := $(confflags) 
 confflags_x += --with-x=yes
-confflags_x += --with-x-toolkit=gtk
+confflags_x += --with-x-toolkit=gtk3
 # For those who prefer the old-style non-toolkit scrollbars, just
 # change the assignment below to --without-toolkit-scroll-bars.  The
 # resulting emacsXY package will have the old scrollbars.